fix: move log collector creation logic #1870
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tedim52
changed the title
tedim52
changed the title
adschwartz
reviewed
Nov 30, 2023
adschwartz
approved these changes
Nov 30, 2023
tedim52
force-pushed
the
tedi/context
branch
from
26e5dd2 to
ae39458
Compare
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 1, 2023
🤖 I have created a release *beep* *boop* --- ## [0.85.39](0.85.38...0.85.39) (2023-11-30) ### Features * emui package details page ([#1873](#1873)) ([e2b75b2](e2b75b2)) * User service ports Traefik Docker labels ([#1871](#1871)) ([d18f20e](d18f20e)) ### Bug Fixes * move log collector creation logic ([#1870](#1870)) ([b695e27](b695e27)) * service name collision error message ([#1863](#1863)) ([164b316](164b316)) * Update custom Nix dev deps to work on also linux ([#1862](#1862)) ([d11cd37](d11cd37)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: kurtosisbot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Fixes: #1833
The resource leak was being caused by a state where if a failure occurred while creating an enclave (eg. ctrl+C while running
kurtosis enclave add) at a point where the log collector container was created BEFORE it had been connected to the network AND before the necessarydefer undos to clean up the log collector had been queued THEN the network would get cleaned up by thedefer undofromCreateNetwork, but the log collector container would remain.Any attempt to do a
kurtosis clean -awould fail to clean log collector container because the network(and thus enclave) the container was created for had already been cleaned up.After digging - I realized the log collector was being created in
container-engine-libas opposed to in theengineMoving the logic to the engine AFTER the enclave is created fixes the issue. If there is an error at ANY point in the creation of the log collector container (even if the log collectorsdefer undohasn't been queued), thedefer undofrom theCreateEnclavecall will clean the log collector because it has a label with theenclaveUUID.Is this change user facing?
NO
References:
#1833